Merge tag 'upstream/2017.4' into debian/master
authorSimon McVittie <smcv@debian.org>
Mon, 17 Apr 2017 14:25:39 +0000 (15:25 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 17 Apr 2017 14:25:39 +0000 (15:25 +0100)
commit2b8e37ab8106eab3b42cabe8d0abaed9358f9381
tree46f22dd6e621040c06908f6124007a44d173c460
parentf53ca70aa69b167fdd401bc4fab715a7bf766911
parent0b7290b235d6dccf2b73e6979e7af554809cea8d
Merge tag 'upstream/2017.4' into debian/master

Upstream version 2017.4